Convert GtkTextView::text properties

2007-07-07  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilderConverter._convert_textview_text):
    Convert GtkTextView::text properties

svn path=/trunk/; revision=18389

diff --git a/ChangeLog b/ChangeLog
index 5888cf06712077c93426bb5de099e1c6f63bfd10..54bdb9d5a9c448d773b50f6ad8aaa0279eb3795c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-07  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtk-builder-convert (GtkBuilderConverter._convert_textview_text): 
+       Convert GtkTextView::text properties
+
 2007-07-06  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkprivate-quartz.h:

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a1b27a2a126e1bea2e8e577a9cc9d07f2012b6f7..3a649df2932a75f2ed3ddeaf024933ba0e6a07b3 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-07  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtk-builder-convert.xml: Update
+
 2007-04-05  Matthias clasen  <mclasen@redhat.com>
 
        * gtk/tmpl/gtkbuilder.sgml: Pixbuf properties

diff --git a/docs/reference/gtk/gtk-builder-convert.xml b/docs/reference/gtk/gtk-builder-convert.xml
index d772fd5596bc5dbe19e0642b69637ad3401d6a0d..dcac9a0b5a35c7846797a83c235bc60c01dd2ec6 100644 (file)
--- a/docs/reference/gtk/gtk-builder-convert.xml
+++ b/docs/reference/gtk/gtk-builder-convert.xml
@@ -28,9 +28,6 @@ its output the file specified as the second argument.
 
 <refsect1><title>Bugs</title>
 <para>
-GtkTextView text is not converted into a GtkTextBuffer.
-</para>
-<para>
 Toolbars are not handled.
 </para>
 <para>

diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
index 8a40ee4fa312f688731226bd25657f704c87ea30..098c2e257695c96f484ffb1c42865fd284665651 100755 (executable)
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert
@@ -19,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # TODO:
-#  GtkTextView.text -> GtkTextBuffer
 #  Toolbars
 
 """Usage: gtk-builder-convert [OPTION] [INPUT] [OUTPUT]
@@ -233,6 +232,8 @@ class GtkBuilderConverter(object):
             elif prop_name == "items" and klass in ['GtkComboBox',
                                                     'GtkComboBoxEntry']:
                 self._convert_combobox_items(node, prop)
+            elif prop_name == "text" and klass == 'GtkTextView':
+                self._convert_textview_text(prop)
 
     def _remove_window(self, node):
         object_node = get_object_node(get_child_nodes(node)[0])
@@ -442,6 +443,16 @@ class GtkBuilderConverter(object):
         attribute.setAttribute('name', 'text')
         attribute.appendChild(self._dom.createTextNode('0'))
 
+    def _convert_textview_text(self, prop):
+        data = prop.childNodes[0].data
+        if prop.hasAttribute('translatable'):
+            prop.removeAttribute('translatable')
+        tbuffer = self._create_object("GtkTextBuffer", None,
+                                      template='textbuffer',
+                                      text=data)
+        prop.childNodes[0].data = tbuffer.getAttribute('id')
+        self._interface.childNodes.insert(0, tbuffer)
+
     def _packing_prop_to_child_attr(self, node, prop_name, prop_val,
                                    attr_val=None):
         for child in node.getElementsByTagName("child"):